diff --git a/ChangeLog b/ChangeLog
index dd0048d58..d98550c8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-01  Paul Giblock	<drfaygo/at/gmail/dot/com>
+	
+	* src/tracks/pattern.cpp:
+	Improve drawing of tact lines, so it is more obvious where a pattern ends
+
+	* src/core/track.cpp:
+	Display floating text underneith the current track so you can actually see
+	what you are doing
+	
 2008-05-27  Paul Giblock	<drfaygo/at/gmail/dot/com>
 
 	* src/gui/piano_roll.cpp:
diff --git a/src/core/track.cpp b/src/core/track.cpp
index f2065d354..c8a6073e8 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -474,7 +474,7 @@ void trackContentObjectView::mouseMoveEvent( QMouseEvent * _me )
 				arg( m_tco->startPosition().getTact() + 1 ).
 				arg( m_tco->startPosition().getTicks() %
 						midiTime::ticksPerTact() ) );
-		s_textFloat->moveGlobal( this, QPoint( width() + 2, 8 ) );
+		s_textFloat->moveGlobal( this, QPoint( width() + 2, height() + 2 ) );
 	}
 	else if( m_action == MoveSelection )
 	{
@@ -531,7 +531,8 @@ void trackContentObjectView::mouseMoveEvent( QMouseEvent * _me )
 				arg( m_tco->endPosition().getTact() + 1 ).
 				arg( m_tco->endPosition().getTicks() %
 						midiTime::ticksPerTact() ) );
-		s_textFloat->moveGlobal( this, QPoint( width() + 2, 8 ) );
+		s_textFloat->moveGlobal( this, QPoint( width() + 2,
+					height() + 2) );
 	}
 	else
 	{
diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp
index 974fc7df8..be06caf93 100644
--- a/src/tracks/pattern.cpp
+++ b/src/tracks/pattern.cpp
@@ -1145,6 +1145,14 @@ void patternView::paintEvent( QPaintEvent * )
 						x_base + static_cast<int>(
 							ppt * tact_num ) - 1,
 						TCO_BORDER_WIDTH,
+						x_base + static_cast<int>(
+							ppt * tact_num ) - 1,
+						5 );
+					p.drawLine(
+						x_base + static_cast<int>(
+							ppt * tact_num ) - 1,
+						height() - ( 5 + 2 *
+							TCO_BORDER_WIDTH ),
 						x_base + static_cast<int>(
 							ppt * tact_num ) - 1,
 						height() - 2 *