T tang issue154

Issue 154 is implemented.  There may be some css work that needs to be done later on.