Fix Algorithm Bug & Finish Present Layout