preview me in the right spot!

This needs review, I tested its working

fixes #1283 
fixes #1015 

Signed-off-by: Antes <antes@simplemachines.org>